diff --git a/system/core/Output.php b/system/core/Output.php
index 081423c..af3c1e7 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -564,8 +564,7 @@
 			.$CI->config->item('index_page')
 			.$CI->uri->uri_string();
 
-		// append querystring
-		empty($_SERVER['QUERY_STRING']) OR $uri .= '?'.$_SERVER['QUERY_STRING'];      
+		empty($_SERVER['QUERY_STRING']) OR $uri .= '?'.$_SERVER['QUERY_STRING'];
 
 		$cache_path .= md5($uri);
 
@@ -650,8 +649,7 @@
 		$cache_path = ($CFG->item('cache_path') === '') ? APPPATH.'cache/' : $CFG->item('cache_path');
 
 		// Build the file path. The file name is an MD5 hash of the full URI
-		$uri =	$CFG->item('base_url').$CFG->item('index_page').$URI->uri_string;
-		// append querystring
+		$uri = $CFG->item('base_url').$CFG->item('index_page').$URI->uri_string;
 		empty($_SERVER['QUERY_STRING']) OR $uri .= '?'.$_SERVER['QUERY_STRING'];
 
 		$filepath = $cache_path.md5($uri);
@@ -733,7 +731,6 @@
 			$uri = $CI->uri->uri_string();
 		}
 
-		// append querystring
 		empty($_SERVER['QUERY_STRING']) OR $uri .= '?'.$_SERVER['QUERY_STRING'];
 
 		$cache_path .= md5($CI->config->item('base_url').$CI->config->item('index_page').$uri);
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index f336b3a..39e644e 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -500,7 +500,7 @@
       -  Added methods ``get_content_type()`` and ``get_header()``.
       -  Added method ``delete_cache()``.
       -  Changed caching behavior to compress the output before storing it, if ``$config['compress_output']`` is enabled.
-      -  Added querystring to page caching.
+      -  Changed caching to take the query string into account.
 
    -  :doc:`Config Library <libraries/config>` changes include: